bitkeeper revision 1.18 (3e33c6cdMqnqQnkIxpq_9HHmWHAHfA)

Merge boulderdash.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into boulderdash.cl.cam.ac.uk:/local/scratch/bd240/xeno

diff --cc .rootkeys
Simple merge

diff --cc BitKeeper/etc/logging_ok
index af88da45af7b8ffa5d076112f58f9227df62b026,9164d8ac247ba3d564973099a2507ae96b86dc9d..2fd8b201d7ed578ae7a7a777a56b8d4cb2316680
--- 1/BitKeeper/etc/logging_ok
--- 2/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@@ -1,6 -1,6 +1,7 @@@
  akw27@boulderdash.cl.cam.ac.uk
  akw27@labyrinth.cl.cam.ac.uk
 +bd240@boulderdash.cl.cam.ac.uk
+ iap10@labyrinth.cl.cam.ac.uk
  kaf24@labyrinth.cl.cam.ac.uk
  kaf24@plym.cl.cam.ac.uk
  kaf24@striker.cl.cam.ac.uk

diff --cc xen-2.4.16/common/domain.c
Simple merge

diff --cc xen-2.4.16/common/memory.c
Simple merge